Merge changes from emacs-23 branch

diff --cc lisp/mail/rmail.el
index 7b896e579bcb9bde1057b14f42461592c24ddf3d,cfd4c7949f2fae670f8e157dcafe239608546925..250481c20b5f3d747c4d9ec288d4888055616740
--- 1/lisp/mail/rmail.el
--- 2/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4289,7 -4286,7 +4286,7 @@@ With prefix argument N moves forward N 
  
  ;;;***
  \f
- ;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "b1ce015fd919b54cc7b1d0b2155489f9")
 -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "5767ec9a393ef5ff12bc1a14d55c949e")
++;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "3735f9bfe6ff3e612091857cc6b401b6")
  ;;; Generated autoloads from rmailmm.el
  
  (autoload 'rmail-mime "rmailmm" "\